app-system: Remove lookup_app_by_tree_entry

We want to move away from gnome-menus eventually, so the simple
utility method isn't really worth keeping around. Reimplement it
in the one place that uses it.

https://bugzilla.gnome.org/show_bug.cgi?id=698486

diff --git a/js/ui/appDisplay.js b/js/ui/appDisplay.js
index aad503252aadc241659c82cf6b83b779908af889..845a7dba490da001af6b92096970117076fbe7e2 100644 (file)
--- a/js/ui/appDisplay.js
+++ b/js/ui/appDisplay.js
@@ -55,8 +55,9 @@ function _loadCategory(dir, view) {
     while ((nextType = iter.next()) != GMenu.TreeItemType.INVALID) {
         if (nextType == GMenu.TreeItemType.ENTRY) {
             let entry = iter.get_entry();
-            let app = appSystem.lookup_app_by_tree_entry(entry);
-            if (!entry.get_app_info().get_nodisplay())
+            let appInfo = entry.get_app_info();
+            let app = appSystem.lookup_app(entry.get_desktop_file_id());
+            if (appInfo.should_show())
                 view.addApp(app);
         } else if (nextType == GMenu.TreeItemType.DIRECTORY) {
             let itemDir = iter.get_directory();

diff --git a/src/shell-app-system.c b/src/shell-app-system.c
index 742fc68e0689271151780390f88af46346b53233..01c468b73e178bb5f6d9eae1b943fbaeefd4505a 100644 (file)
--- a/src/shell-app-system.c
+++ b/src/shell-app-system.c
@@ -449,25 +449,6 @@ shell_app_system_lookup_app (ShellAppSystem   *self,
   return g_hash_table_lookup (self->priv->id_to_app, id);
 }
 
-/**
- * shell_app_system_lookup_app_by_tree_entry:
- * @system: a #ShellAppSystem
- * @entry: a #GMenuTreeEntry
- *
- * Find a #ShellApp corresponding to a #GMenuTreeEntry.
- *
- * Return value: (transfer none): The #ShellApp for @entry, or %NULL if none
- */
-ShellApp *
-shell_app_system_lookup_app_by_tree_entry (ShellAppSystem  *self,
-                                           GMenuTreeEntry  *entry)
-{
-  /* If we looked up directly in ->entry_to_app, we'd lose the
-   * override of running apps.  Thus, indirect through the id.
-   */
-  return shell_app_system_lookup_app (self, gmenu_tree_entry_get_desktop_file_id (entry));
-}
-
 /**
  * shell_app_system_lookup_app_for_path:
  * @system: a #ShellAppSystem

diff --git a/src/shell-app-system.h b/src/shell-app-system.h
index 6b3cd89eeecc845422927fbdfdf8df5642be92fb..4305878e76793bd33d6541342b111c85b13ddbc8 100644 (file)
--- a/src/shell-app-system.h
+++ b/src/shell-app-system.h
@@ -43,8 +43,6 @@ GMenuTree      *shell_app_system_get_tree                     (ShellAppSystem *s
 
 ShellApp       *shell_app_system_lookup_app                   (ShellAppSystem  *system,
                                                                const char      *id);
-ShellApp       *shell_app_system_lookup_app_by_tree_entry     (ShellAppSystem  *system,
-                                                               GMenuTreeEntry  *entry);
 ShellApp       *shell_app_system_lookup_app_for_path          (ShellAppSystem  *system,
                                                                const char      *desktop_path);
 ShellApp       *shell_app_system_lookup_heuristic_basename    (ShellAppSystem  *system,